Replace patch with the version applied upstream in 2017.12

diff --git a/debian/changelog b/debian/changelog
index 467cd3f9bab585e1a4c411e8b725dc83b1e06f7e..8e7ba67e1f8eb6f5ecfc86389336d45605dac1b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ostree (2017.11-2) UNRELEASED; urgency=medium
+
+  * Replace patch with the version applied upstream in 2017.12
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 19 Sep 2017 10:37:12 +0100
+
 ostree (2017.11-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch b/debian/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch
new file mode 100644 (file)
index 0000000..d909e61
--- /dev/null
+++ b/debian/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch
@@ -0,0 +1,45 @@
+From: Simon McVittie <smcv@collabora.com>
+Date: Fri, 15 Sep 2017 15:32:55 +0100
+Subject: tests: Fix JavaScript tests with gjs 1.50.0
+
+In recent gjs, you can't declare a variable with "let" multiple times.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Closes: #1178
+Approved by: cgwalters
+Forwarded: https://github.com/ostreedev/ostree/pull/1178
+Applied-upstream: 2017.12, commit:1b430a776486d68be2d16a0ec53ad5512c604988
+---
+ tests/corrupt-repo-ref.js | 1 -
+ tests/test-sysroot.js     | 6 +++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js
+index c5f2806..bcde86b 100755
+--- a/tests/corrupt-repo-ref.js
++++ b/tests/corrupt-repo-ref.js
+@@ -47,7 +47,6 @@ function listObjectChecksumsRecurse(dir, allObjects) {
+     e.close(null);
+ } 
+ 
+-let [,commit] = repo.resolve_rev(refToCorrupt, false);
+ let [,root,commit] = repo.read_commit(refToCorrupt, null);
+ let allObjects = {};
+ allObjects[commit + '.commit'] = true;
+diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js
+index 40397fe..e7250a8 100755
+--- a/tests/test-sysroot.js
++++ b/tests/test-sysroot.js
+@@ -97,9 +97,9 @@ assertEquals(deploymentPath.query_exists(null), false);
+ 
+ //// Ok, redeploy, then add a new revision upstream and pull it
+ 
+-let [,deployment] = sysroot.deploy_tree('testos', rev, origin,
+-                                      mergeDeployment, null,
+-                                      null);
++[,deployment] = sysroot.deploy_tree('testos', rev, origin,
++                               mergeDeployment, null,
++                               null);
+ newDeployments = deployments;
+ deployments = null;
+ newDeployments.unshift(deployment);

diff --git a/debian/patches/Fix-JavaScript-tests-with-gjs-1.50.0.patch b/debian/patches/Fix-JavaScript-tests-with-gjs-1.50.0.patch
deleted file mode 100644 (file)
index f92ff12..0000000
--- a/debian/patches/Fix-JavaScript-tests-with-gjs-1.50.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 15 Sep 2017 15:32:55 +0100
-Subject: Fix JavaScript tests with gjs 1.50.0
-
-In recent gjs, you can't declare a variable with "let" multiple times.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- tests/corrupt-repo-ref.js | 2 +-
- tests/test-sysroot.js     | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js
-index c5f2806..a2085f3 100755
---- a/tests/corrupt-repo-ref.js
-+++ b/tests/corrupt-repo-ref.js
-@@ -47,7 +47,7 @@ function listObjectChecksumsRecurse(dir, allObjects) {
-     e.close(null);
- } 
- 
--let [,commit] = repo.resolve_rev(refToCorrupt, false);
-+repo.resolve_rev(refToCorrupt, false);
- let [,root,commit] = repo.read_commit(refToCorrupt, null);
- let allObjects = {};
- allObjects[commit + '.commit'] = true;
-diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js
-index 40397fe..e7250a8 100755
---- a/tests/test-sysroot.js
-+++ b/tests/test-sysroot.js
-@@ -97,9 +97,9 @@ assertEquals(deploymentPath.query_exists(null), false);
- 
- //// Ok, redeploy, then add a new revision upstream and pull it
- 
--let [,deployment] = sysroot.deploy_tree('testos', rev, origin,
--                                      mergeDeployment, null,
--                                      null);
-+[,deployment] = sysroot.deploy_tree('testos', rev, origin,
-+                               mergeDeployment, null,
-+                               null);
- newDeployments = deployments;
- deployments = null;
- newDeployments.unshift(deployment);

diff --git a/debian/patches/series b/debian/patches/series
index d3bc5c55af21f5ccb35654074e353f33e16760a1..83f098ba0ebd59d3a6738aba2b99f01a0ba9253b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-Fix-JavaScript-tests-with-gjs-1.50.0.patch
+2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch